From 9ba63e10aa3ee914edb23472fdef95d11d9234ad Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 6 Oct 2008 16:27:44 +0000 Subject: [PATCH] Allow internal_styles regeneration in out-of-tree builds. --- Makefile.in | 6 +++--- mkstyle.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 31123622f..eea15c46c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,7 +33,7 @@ OUTPUT_SWITCH=-o # #OPTIMIZATION=-O $(EXTRA_OPTIMIZATION) #DEBUGGING=-g $(EXTRA_DEBUGGING) # add -DDEBUG_MEM to turn on memory allocation logging -GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I. \ +GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I@srcdir@ \ $(OPTIMIZATION) @CFLAGS@ LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@ PREFIX=@prefix@ @@ -1028,5 +1028,5 @@ zlib/trees.o: zlib/trees.c zlib/deflate.h zlib/zutil.h zlib/zlib.h \ zlib/zconf.h zlib/trees.h zlib/uncompr.o: zlib/uncompr.c zlib/zlib.h zlib/zconf.h zlib/zutil.o: zlib/zutil.c zlib/zutil.h zlib/zlib.h zlib/zconf.h -internal_styles.c: mkstyle.sh style/*.style - ./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1) +internal_styles.c: mkstyle.sh @srcdir@/style/*.style + @srcdir@/mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1) diff --git a/mkstyle.sh b/mkstyle.sh index 19db383a3..8e82354d2 100755 --- a/mkstyle.sh +++ b/mkstyle.sh @@ -6,7 +6,7 @@ echo echo "#include \"defs.h\"" echo "#if CSVFMTS_ENABLED" nstyles="0" -for i in style/*.style +for i in `dirname $0`/style/*.style do A=`basename $i | sed "s/.style$//"` [ $A = "README" ] && continue -- 2.30.2